Merge "API tweaks"
am: 13152049e9

Change-Id: I7339a8e77cea9bea236977f8a5df39c28feadaa5