DO NO MERGE -- Revert the following two commits as they're causing flickering...
DO NO MERGE -- Revert the following two commits as they're causing flickering am: 44bd57ee am: 26509f52
am: 8a688436 -s ours
Change-Id: I9326eeee2a34aca480940dc260fe67ec6c20f02f