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

Change-Id: Ibf26efe9aa858a1f6c4fce645bc67e55e7350576