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

Change-Id: I9f0ecbae1aba43e1077d017d9fb364bb874e0fa3