Merge "docs: fixing a couple of typos" into pi-dev
am: 880aba2163

Change-Id: I3e546080a808181c67fd219aa62bf61511a777cb