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

* commit 'eb1e5252232ce030e0c87991ae08aecaa14365ae':