Merge changes I82856f84,I97c44ff8 into qt-dev
am: 5d6551b5b4

Change-Id: I986e497cd9419d342d78460a6279b4567d271e0f