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

Change-Id: I36bd613d2bdb264760d0e07fb2a2c3b05f2302f1