Merge "Decreases likelihood of AoD flickering" into oc-mr1-dev
am: c856aa18e3

Change-Id: Ia9a137a7d7d4e0b170dabdae7aa5fd4253255a6e