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

Change-Id: I994965422a1d7d4007b4a3954dd2599a77372213