Merge "Attempt to fix receiver registering problems" into nyc-dev am: 8dbc166353
am: 762f0e137c
* commit '762f0e137c350ab5de3a663e1a20bdc790703b76':
Change-Id: I6dd6c35844cfe32843f64cb3302da058bbb8ac7d
This commit is contained in: