Merge changes I1aa11f40,Ia707a806 into qt-dev
am: c0c0fd95ea

Change-Id: Iba262e3b8c0fd5fc978baafeff38108b7b4b97c8