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

* commit '22644e52f049b00163b04ecb8f221c52701aa0d6':
  Change pre-recovery into two services