Merge changes I342cd7d0,I2c55831b into qt-dev
am: a58591179b

Change-Id: I0ba72b338102a3ef4ebbdef5ac37517ccc91ddc2