Merge "Fix PlatformCompatTest for internal"