Hygiene: Hide API yukiness

Change-Id: Ie052c3d44d740e13ae4c18695666de8f15a6430f
Merge "Hygiene: Hide API yukiness"