Merge "Tighten native API surface."