Merge "Hide unnecessary extra name constants in ClipDescription" into nyc-dev