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: 87edb098

Change-Id: Ia73d03e0e7249c692e89b71b4bf9ff457559d004