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

* commit 'aa3a45ba5bc78ab4015a1d2c4c361d3f54118d8e':
  Fix for broken docs build.