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

Change-Id: I0589f8e1bc04c19f5849cd7adfd91c7ad556fd50