This reverts commit 3e208562. Reason for revert: test for b/186197537 Change-Id: Ifd17094f0231b0d6efcf1318cbc86560c5a8f6d1