Merge "cherrypick from mr2 Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90 docs: fix typos"