Merge changes I146430a1,I60d41eaa into qt-dev am: a8eb68a59b
am: 549f89f821

Change-Id: I48f3320968abb78847a990332abb8a14e644a76d