Merge "Revert "[automerger skipped] Merge "DO NOT MERGE - Kill apps out..."" into qt-qpr1-dev am: f4f30312fa -s ours am: 2fea0b147f am: 14978c1c04 am: 87edb098be am: 7f56832590 -s ours
am skip reason: subject contains skip directive Change-Id: I657c29c156525cdf15d7ee6e5bcabaf5a1c63004
This commit is contained in: