am 77e7f401: am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build."

* commit '77e7f401161e778e7f06401ac72b132f5272d4e2':
  Fix for broken docs build.