Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev am: 4f179bb174
am: e743aeb922

Change-Id: Ice5fc23658245af695a38ac8aebfa5230ebc138c