Merge "AOD: Fix more flickering" into oc-dr1-dev
am: f2c8a24f56

Change-Id: I8027fe0d4050ca906c4e8973e9c5a9ad0ffa802c