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

* commit 'c91d28ba55a217c8086755dbae0936f6d1b27306':
  Fix NPE if workspace is not created yet