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

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