This reverts commit 05ea98a3f9. Bug: 64693551 Change-Id: I8e7a7b2c5f575cee28f977ae7f3c10752a15d49c
05ea98a3f9