am fd4f254b: am 67633d3d: am 22644e52: Merge "Change pre-recovery into two services"

* commit 'fd4f254b7f14b044e606987a69c9e0c1cccd73f9':
  Change pre-recovery into two services