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

Change-Id: I547a0596de397469e02d88a524610c546c59f5f7