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

* commit '41ab376387db8b0c547f1dfc86befe6fbca7eabb':