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
Change-Id: Ida9b5486a8aee873893a7d14b9aa07b83692049b