Merge "[Mainline] Add @hide. Revisit and redesign in S" am: 8b3f684395

Change-Id: I2d3a7bf67c6551f7b9d45a051ab4a19bd45d558f