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 am: 9050a67d -s ours
am skip reason: subject contains skip directive

Change-Id: I81248c86a1be972fd8c5170db541b368aeb7f131