This reverts commit e7b2a789. Bug: 196269975 Bug: 196300136 Change-Id: I2942c79e837ce49a5c937c118218a2834d685584