Merge "Fix Os.getDefault() BlockGuard test."