Merge "Revert submission" into qt-qpr1-dev
am: 65c9665125

Change-Id: Id444c3a9c767de5144ee2ded8f4c1cabca304670