This reverts commit ff88b14e62.
Reason for revert: API Council push back
Bug: 113696451
Bug: 116798156
Change-Id: I328d981b96d44e37c58625b48334891baf9a8487
This reverts commit ff88b14e62.
Reason for revert: API Council push back
Bug: 113696451
Bug: 116798156
Change-Id: I328d981b96d44e37c58625b48334891baf9a8487