am e954a45e: 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 'e954a45ee3b14f04211933cfce105c1bb34e8f3d':