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

Change-Id: I394abcb39e0fc12f0c7042d57f7aa37878a01ac6
BUG: 129345239