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

Change-Id: I2cc3648a2d4f2e65d5b50215834a7350a55ce6e1