Merge changes Ia9932379,Ic5e2fa1c into qt-dev
am: 2a9f8b378b

Change-Id: I064492b3355c56a355703ee3a7f8c59f9fdf3fde