Merge changes I84461d40,Ib3ab9105 into qt-dev am: 3fe30fa71b
am: b63abe5f0e

Change-Id: I55f63560154e23d5dd02ca9a80f744d18fa70794