Merge "Hide APIs not intended to ship in DR." into oc-dr1-dev
am: 3d4c62de10

Change-Id: Iea3267aeea3c9633876cc055e45d095e0c5f1306