Merge "Update cmd_mapping for no-early-device-release"