This reverts commit 9c4045f7c9.
Reason for revert: API council feedback
Bug: 210800751
Change-Id: I2ebcc0a94aad393e75a6aaf2addc333eb7fa437f
This reverts commit 9c4045f7c9.
Reason for revert: API council feedback
Bug: 210800751
Change-Id: I2ebcc0a94aad393e75a6aaf2addc333eb7fa437f