Merge "AOD: Fix flicker at end of AOD2" into oc-dr1-dev am: 3889146f82
am: 1d6357c800

Change-Id: I1388ed148723d5d2d6f0d966e8fec0c9d956a552