Merge "tests: recovery_unit_test requires root." am: 15a381e52c am: 687bb18724
am: 3fd5d407a4

Change-Id: I84f1b329114b423e4a308e0577d4324de1c63e76