Merge "Make slight API and doc adjustments"
am: b7e10650d8

Change-Id: I96a361924ddff300eb36933bed67d30ec00e8f87