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

Change-Id: I43153608f5d17d0c82136c34e2282d567dee13b9