Merge master@5406228 into git_qt-dev-plus-aosp.
am: cc8110f787

Change-Id: I2d4c3f560628857493b24c09e12b51fb869b56d5