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

Change-Id: I4aeaa57839d89b556aef2bc926626440b76f970b