Merge master@5428150 into git_qt-dev-plus-aosp.

Change-Id: Id7597be0a4b7c6c7a1ac9245a854c9a6acd5206e
BUG: 129345239