the API council feedback. BUG: 120841922 Test: Build Change-Id: I630134955bb86b36e8d186e92302ae141629f4f6