Merge "Ensure upgrade to video requests are ignored when video disabled." into...
Merge "Ensure upgrade to video requests are ignored when video disabled." into oc-mr1-dev am: a9732050
am: 5185dd85
Change-Id: I86e50ef485c9b8ac8113eedc4201367df1714df8