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: 14978c1c am: 510b4917 am: cae2155d

Change-Id: I29bd91bde6231b0ae8cc2b72b23beb81d9319e7e