Merge "BroadcastReceiver refactoring" am: 73a57bb9da am: bcdd7475e5 am: 2d49de42b8
am: 75de0b6421

Change-Id: I98b9a0c46a0e3b69a74e2a8c2320090edcb1ad5b