Merge "docs: Fixing malformatted HTML escape" into oc-dev am: 1272847f1d
am: 670286ea89

Change-Id: I8f9acee143abd62b2d0599ad7ee866235916084d