Merge "Settings: Fix leak of BroadcastReceiver intents" am: 3499af28c4 am: 1b4a0abdbb am: 517b35fa1c
am: d2ff3244dc

Change-Id: I57c99fcf7698535177c23b62e45f8e1a032a7220