Merge "Removing AutomaticBrightnessStrategy refs in DPC2" into udc-qpr-dev