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

Change-Id: I7c1c3ff3a278c536f2483ce5bd58360ab3bbe2cf