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