Merge changes I3c756d61,Id0f6cf61 into qt-dev
am: c9f1a05ae1

Change-Id: I4c2076032bbbacd406312eca444169e293210b8b