This reverts commit 01fc975288. Reason for revert: b/355042336 Change-Id: I1a5038e1608624dc1bc774940d84aea09381da87
01fc975288