Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2 am: f125024688" into oc-mr1-dev