Merge master@5406228 into qt-dev.

Change-Id: I9ef1330d41aa0da0dd537ddd644daeda38c532ad
BUG: 129345239