This reverts commit e7ec8b25. Because tests are failing. Bug: 33192586 Change-Id: I3e575c6c037873195c2177241153e3646d58e8a6