am fb909790: Merge "Bug 17243357: Remove MessagingConfigurationManager" into lmp-dev

* commit 'fb90979054c6800b00b8c4e2890f04f055b4077e':
  Bug 17243357: Remove MessagingConfigurationManager