Annotations/@hide consistent across defined types. am: 9f2a43304d am: 76f0c7a7d8

Change-Id: I225fa0be74c887efe31ab6560c9163ade7892d8e