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

Change-Id: I2dc24e4a57e8633e5042039292e7486a2eda69d9
BUG: 129345239