Merge changes Ia64238f3,I45056904 into qt-r1-dev
am: a7719614c6

Change-Id: Ifaae76be4b927e16df3d96df9f4480424b2b0fe2