Merge "Address comments from API Review."
am: 18e47b6108

Change-Id: I3a4c1a0592df3b3c4f7625553bc9b92296da5c73