Likely causing b/259499400 This reverts commit a92688d642. Change-Id: I781a7ecf9139eca11e1db895f86268b893258543
a92688d642