Merge "Include AE Flicker tests to be tracked" into udc-qpr-dev