Merge "Make 115-native-bridge idempotent"