Merge "Revert submission 9940985-qpr1-dev merge" into qt-qpr1-dev am: 1cbccc3fa3 am: c1e0895727

Change-Id: I2ca62699446d4abb72cc5974c87813937fae81d8