Merge "Add additional logging for EMBMS edge cases"
am: de57d0d024

Change-Id: If9af4947275e18154c93d9d8f6756cac16317768