Merge "Add protection for codec interface name change."