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

Change-Id: I53b61012cada99740641644adba059fa53d42f5b