Merge "Tighten native API surface."
am: d2c4eb0dae

Change-Id: I1733369762a612f53b23b8b4a5ce8d0ccc959d34