Merge "Revert submission" into qt-qpr1-dev
am: 775106e40d

Change-Id: I90ea8783da54caf1f3e140b7eb768129d8332f61