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

Change-Id: Ib8a7f3454d509d68d62210f286107d4f07fb86c2
BUG: 129345239