Merge master@5406228 into qt-dev.

Change-Id: I4c62afe1d4673a0f1ed5a47a5270cba7ae450a9b
BUG: 129345239