update the api surface after some late fixes Bug: 225745567 Test: Build Change-Id: I5f14776ddb1d042c77ec4ea0fab0e25b4a89a4a1
f9fcd028df
d02479f849
7ab456ee2a