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 am: ef5059e9

Change-Id: Ibe5ab6db0fa7925731f47720fc495f648c1d8d6b