Merge changes I66eac0c5,I07602072 into qt-dev am: e252d155b1
am: db47069d52

Change-Id: I347b2bb02a6fac4c6275da31ff94dcc0923a9ca0