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

Change-Id: Ibec797ea98e43ef450fe6a095550c5c73c4f8604