Merge master@5406228 into qt-dev.

Change-Id: I34406ee33542edc5790627fbc5222da99001b52f
BUG: 129345239