Merge "Merge "Add additional logging for EMBMS edge cases" am: de57d0d024 am: 8b8591ce46" into pi-dev-plus-aosp