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

Change-Id: Ic3f5297c574aaa3598939399c623c2920623b3ba