Merge "Add test provider commands to location shell commands."