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