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

* commit 'f6969bc0388bcd5d0542ff18c09901a030531a5e':
  NPE on configuring library documentation