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

Change-Id: I8dc3e1eaaf3481cba4f67f117d553f254071cc1e