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

Change-Id: I3f66d8adaed78ea53f52d97e51c986487def3818