Merge changes Id9b40acc,I6ddff3f8 into qt-dev am: 464d4ff728
am: 1514d367d9

Change-Id: I8ec1304c937a19c26cf95098af493a23c7c6f98a