Merge "Revert "Merge "Revert submission 9940985-qpr1-dev merge" into qt-qpr1-dev am: 1cbccc3fa3"" into qt-qpr1-dev-plus-aosp am: 01abf88af9

Change-Id: I5d75d8ef56bb5faf9949f466dbd9c93a7e62d9a6