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

Change-Id: Iebff2debebae11673761f1f2a5bb88525e83f419
BUG: 129345239