Merge "Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev am: 5b0a4eea8d" into pi-dev
am: ba22b7f4fd

Change-Id: I73239a97490ea456d5c7d7413e1277307c4caec8