Merge "Add more specific consumer names for common buffer queue endpoints." into mnc-dev