Merge "Use system api for shell command handling"