3169ac4e18
When building the docs using `tox -e docs`, several warning messages would print out. This change fixes the issues causing those warnings. Change-Id: I57503c75f6c07c020bb3bfa34de6aa8f66983ff7