am ad7cf95c: am ee2e13e7: Merge "Don\'t unregister MobileSignalControllers still used" into lmp-mr1-dev

* commit 'ad7cf95c604732b36cd4b0da394b48cfd3dba878':
  Don't unregister MobileSignalControllers still used