[automerger skipped] Merge "Revert submission" into qt-qpr1-dev am: 65c9665125
am: f8a5719cfc -s ours
am skip reason: change_id Iff36d5a10e6c8ee8978a5842af8f19efc10c0a91 with SHA1 5579604a1d is in history

Change-Id: Iceeedbce2cc16fb2c46b944d80a3c5363ea40de7