am fb002677: am baaa1ae9: am a22bb1c1: am 09614c79: Merge "Remove Audio and Video Related Tags" into ub-gmail-ur14-dev

* commit 'fb002677675a901ed8e5dc37792a69add4805dcc':
  Remove Audio and Video Related Tags