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

* commit '74a0744ec19de54096638978bfe1eccfe2ed4e01':
  Fix issues around process teardown after full-data restore