Merge "API tweaks round 2"
am: 3c0a49ec48

Change-Id: I672796cc23b917efe89eb0d54a7098856221fe63