Merge "Merge "Fixed a clipping issue in AOD" into oc-dr1-dev am: 0ee78fd385" into oc-mr1-dev