Merge changes I188f11e9,I6e77dc2c into qt-dev
am: f03a3a6fb9

Change-Id: Ie92d43f7dc4c89c1b422b6d83545c00da9e02f6e