Merge "NPE on configuring library documentation" into studio-1.1-dev automerge: f6969bc
automerge: 91d6a03

* commit '91d6a037a8301767ac2afa65367f9d771df5722b':
  NPE on configuring library documentation