Merge "Video badging levels: @Deprecate and @remove" into oc-dev
am: 0a5b14309a

Change-Id: Icce4883fe59bede2e91c091b8e4734b7224eb0e3