Merge "[incremental] Java service and shell command handler"