58a8c12713
This reverts commit dad61a0098.
Reason for revert: b/279059025
Change-Id: Id8fcd1ddf67d7df0a23c81e3ddf3849c26c529bd