Merge "Clarify docs a bit" into oc-mr1-dev am: 7d203f3938
am: e63b7f28f5

Change-Id: I8b3fec561deb493c0ffaeec321ebb778115a1d36