Fixed some minor doc building errors

Change-Id: I91709c3fc6e937fdb31b418ac98fe5a67265cea7
Merge "Fixed some minor doc building errors"
Merge remote-tracking branch 'upstream/master'