Merge "Fix StrictModeTest#testNonSdkApiUsage"