DO NO MERGE -- Revert the following two commits as they're causing flickering
am: 44bd57ee25

Change-Id: Ie4504d027160fd58c3dab7dc372849f2a1e4ae51