Merge master@5428150 into git_qt-dev-plus-aosp. am: 4f9420710c Change-Id: I2c6527592aa747ac6744094f2fcc0d431cd86ed4