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

Change-Id: Ie13260ff426a0a160c44a1a7f05a2f3b2e86548a