Merge "AOD: Refactor low and high brightness modes" into oc-dr1-dev