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

Change-Id: I33d2191b2e499a0febebd7ea55d9f294bd49f0f9