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

Change-Id: I74ed1783d59efa404e32a66ee764557a2400f8f2