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

Change-Id: I3c82386f43d19b0b273c5b19279eff38a114e73e