Merge "tests: recovery_unit_test requires root."
am: 15a381e52c

Change-Id: Ide2897a766d159126d9b0b38882f9cdde0ac2b9e