Merge "Hide unnecessary extra name constants in ClipDescription" into nyc-dev am: e1efbce
am: ee03cdf

* commit 'ee03cdf9a71c67edd56f3dfef3c4258aa36800dc':
  Hide unnecessary extra name constants in ClipDescription

Change-Id: I425e34fa44893b1e745e387a8393df52bd275136