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

Change-Id: I03b0fdf8c90ccc0455087538565b51934c855c28