Merge "Add additional logging for EMBMS edge cases"