Merge "Revert "[automerger skipped] Merge "DO NOT MERGE - Kill apps out...""...

Merge "Revert "[automerger skipped] Merge "DO NOT MERGE - Kill apps out..."" into qt-qpr1-dev am: f4f30312 -s ours am: 2fea0b14 am: 4cf630f9

Change-Id: Ib144693b67b0c30be0f4d8437f1cc2273b9fb77d