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

* commit '67633d3dc3437321d12798ba2235dcc880fcc440':
  Change pre-recovery into two services