Merge "Add some more logging, reduce startup delay to 1 sec." into jb-mr1-dev