This reverts commit 6e79d12510.
Reason for revert: b/234737949 - the test this added is failing
Change-Id: Ia88853e738faea7fd7b4bfc6d2099cee0fb7d256
This reverts commit 6e79d12510.
Reason for revert: b/234737949 - the test this added is failing
Change-Id: Ia88853e738faea7fd7b4bfc6d2099cee0fb7d256