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

Change-Id: I5c793c7dc11e1acac82feed8f4bada2a9f493ede