Merge master@5428150 into git_qt-dev-plus-aosp.
am: e40d8550b9

Change-Id: I8ac4f7465a1dbd2f14d7ab20861ab0c30b34dc2f