Merge "Fixed a clipping issue in AOD" into oc-dr1-dev