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

Change-Id: I2ea20b95174c07df97b65e776f3a85020a15f848
BUG: 129345239