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

Change-Id: Iff4044c52e7ccdf6f7f879b9d5457ce1458b21bd