am 4de7b0ff: am 74a0744e: Merge "Fix issues around process teardown after full-data restore" into mnc-dev

* commit '4de7b0ffb06053183d991705b113fb9fe3c9075b':
  Fix issues around process teardown after full-data restore