Merge "API tweaks round 2" am: 3c0a49ec48
am: 87d1b7a83e

Change-Id: I3ebb3acd965b0385554f152ec7f6b95c5313f9ca