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

Change-Id: I1d85bdd66c2fa1a495a4e09f6d6ddd00d15da0a5
BUG: 129345239