Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev
am: b6ee436eee
Change-Id: If0dbc782680fe95d1a460ab8109ed94fd0419e25
This commit is contained in:
am: b6ee436eee
Change-Id: If0dbc782680fe95d1a460ab8109ed94fd0419e25