am 6b0938f7: am 6484f3d1: Merge "Change pre-recovery into two services" into mnc-dev

* commit '6b0938f7fb39ad4ad071c2b493545409a3d69f41':
  Change pre-recovery into two services