Merge "Revert "[automerger skipped] Merge "DO NOT MERGE - Kill apps out..."" into qt-qpr1-dev am: f4f30312fa -s ours am: 2fea0b147f am: 14978c1c04 am: 510b49176f am: cae2155d33 am: 9050a67d50 -s ours
am skip reason: subject contains skip directive

Change-Id: I81248c86a1be972fd8c5170db541b368aeb7f131