Merge changes I430ecb8a,I611a92ef into qt-dev
am: 7e80e05030

Change-Id: I2c456e3c9d81ded8d661f93dcbd4162a06a04c7a