Merge commit 'vicamo/bugzilla/834160/master' into HEAD
Bug 814581 - Part 1/N: instanciate multiple RadioInterface instances
Bug 814581 - Part 2/N: fix content message delivery