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

Change-Id: Ida2487f5be62ea6f4de0668abb830590494c880a