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