Merge changes Iac75e4f7,I6569bb45 into qt-dev am: 84cf1cb9e2
am: 33a49acd71

Change-Id: Iff8755afd2806b9c3c0ecbf9b834be49083fc52b