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

Change-Id: I026b8b7d01bd9ebb4e3a63970e00b0e1a2efb37e