Fix various Sphinx warnings

Change-Id: I68c9ff6fdf9115d1abb0fb756eb806b92af29286
Merge "Fix various Sphinx warnings"