Merge "Update car COD to account for format bits so we can be Car Audio again" into main