Merge "Make RecoverySystemService more testable" am: 49af39e751
am: 1b506101de

Change-Id: Iae3938bb6cb9703e79bc0836b8e85f82de025c26