Merge master@5428150 into git_qt-dev.

Change-Id: Ia9a19cac4fe4af0f0e3e7fdf04e6d23bcfb33053
BUG: 129345239