Merge "Enable native_bridge_support"