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

Change-Id: Ia6e1e8fabbe4f7c418d8e1a68ea1ea37cb293139