Merge "Merge "AOD: Fix flicker at end of AOD2" into oc-dr1-dev am: 3889146f am: e4fb1cbd" into oc-mr1-dev-plus-aosp