Merge master@5406228 into qt-dev.

Change-Id: I6155fa3721cf5f7c9f04fbcc122cd1c24c14e231
BUG: 129345239