Merge master@5406228 into qt-dev.

Change-Id: Ic7eb8772db3af1c37f1c03762db8d05fe2439b07
BUG: 129345239