Merge "Revert "API tweaks"" am: c61bb461b6 am: 8230f428e4
am: fdc3dc5670

Change-Id: I53aba1bcac7bc5aabba152dcb9f6510befba4f69