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

Change-Id: Ib47f33e71eb3ef83c2cb0231048531da0003d2cd