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

Change-Id: I90ad865bda1bb1efb66628e91ea4ec0758579e0a