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

Change-Id: Idfcca6b933d0a42dd818d6ca8e999ffa2527b04e
BUG: 129345239