Merge master@5406228 into qt-dev.

Change-Id: I0e6dd4b8a2c94dc1ac55a682668520f27dcf6477
BUG: 129345239