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

Change-Id: I233e7bb4902eba990aac1ee410d16ccd771c1ecc