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

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