Merge "Address comments from API Review." into pi-dev
am: a78a764fe3

Change-Id: I5aa5100fc837a813b8af60d26a05b29707aa5380