Merge "Try to fix receiver crash" into nyc-dev am: 5a2d6800b6 am: bf96779cbf
am: f681c515cd
* commit 'f681c515cdab554bf2eb39b81681d901dd055c80':
Change-Id: I52bdbb736c8dc2a58ab30870d7957615cd93a2fe
This commit is contained in: