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

Change-Id: If549a1080cf61a93ffd236b79b2c3097db80d488
BUG: 129345239