Merge "Revert submission 9919844-manual r1 merge" into qt-r1-dev am: b7c7866043 am: eec32327da

Change-Id: I4e665288fc26661f5a3e5fac992220c555619d4b