Merge "API tweaks"
am: f3fbbeaa05

Change-Id: I3d45d13a482125edd91ec86e5c297f9fdb976072