This reverts commit 50673d80. Reason for revert: non-existing bug number prevents API council tracking Bug: 191404931 Change-Id: Iaccc698a1034e9387b7918eda826438dfe3a9485