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

Change-Id: I4dfc8c44f3bc35160266d3fec0bc6756f3d8b8db