Merge changes I296c1011,I05695607

* changes:
  Add RecoverySystemServiceTest to presubmit
  Check the return value of RoR preparation/clear