Merge "Broadcast Radio service cleanup." into oc-mr1-dev
am: 8a71933f09

Change-Id: I7dc78730c3b9a23283a70e2ca71b7b9742d90fce