am 240946d7: am c91d28ba: am c6be6eec: Merge "Fix NPE if workspace is not created yet" into jb-ub-now-indigo-rose

* commit '240946d7c8f10d27e5ffc3bafbd88d3babb1ff84':