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

Change-Id: Iaaec50eebdafe274c4000d2aac07bb739766153c