Merge "API review feedback changes"
am: 84ea11384d

Change-Id: I37c4f558d313d3ea7f201633273dc53f6ffd128c