Merge "API tweaks" am: f3fbbeaa05 am: 4c3e0ccfa5
am: fe12d8de3f

Change-Id: I13342f7735adb24240c4ca34245f93e3d7579d78