Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev am: acc55e61dd
am: 4adbc6b5b0  -s ours

Change-Id: I7dcbba1052771fbfe6ef74c10b52a41941db1895