Merge "Revert "[automerger skipped] Merge "DO NOT MERGE - Kill apps out..."" into qt-qpr1-dev am: f4f30312 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie22def6bf2c3953aac5c91b6ad79c6f6eecdad01