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

Change-Id: I17e99073107cfe247c23001a767ed97e6ffa346f
BUG: 129345239