Merge "Add extra hidden api related tags" am: cfd72b9386 am: d63ef04944
am: b270bc89cf

Change-Id: I1c949ca80ca5312780906522f5a0af9a5319cfc0