Merge "Clean up parameter handling of Car ADB commands"