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

Change-Id: I4484f507451a8959a024e1dc09c66c9b2d24f358