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