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

Change-Id: Id81c416a2d7dc5467dd8c6f37e0f0c5be49fe13a
BUG: 129345239