Merge "Address the API review comments."
am: 322ff16301

Change-Id: I4892b391672b0f125d47d9ddec02c1645d7cb2d3