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

* commit '6484f3d1cb4078c7525e23d16c7e7bcd90afa653':
  Change pre-recovery into two services