Merge master@5406228 into qt-dev.

Change-Id: Ie3204ef066e304534c6f2024dedac9b132c8c169
BUG: 129345239