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

Change-Id: I84aa982760377be0df6f8fbca6d5a32d1036f16a