Merge changes I0a5c576b,I54fcf97b into qt-dev am: d1cbccb628
am: b65ae655ad

Change-Id: I568a0a7143d9e1ade2123a0f34cb8a08529b5a69