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

Change-Id: I38c7dfdaed0e850765be8c77e0ed6108c9a24ea2
BUG: 129345239