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

Change-Id: Ief0b029527ec71a6744ba2b6a72751e8a5b2bf98