Merge "DO NO MERGE -- Revert the following two commits as they're causing...
Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev am: b6ee436e am: 998b21c6
am: d14f0980
Change-Id: Iabd07f20674194d75aad4b375e362198516c0173