[automerger skipped] Merge "[Mainline] Add @hide. Revisit and redesign in S" am: 8b3f684395 am: dde098b26e -s ours

am skip reason: Change-Id I9f301b65a3a476a114821c77916dbdb988e5d983 with SHA-1 cd7d966476 is in history

Change-Id: I8501bc08efc017f676ed008dd92e6927b4616a58