Merge "Delete unused broadcast receiver" into nyc-mr1-dev am: 1b4ad1c701 am: 0ead15f0be
am: 41f5ce85ea

Change-Id: Ia03880b7f531d514778abee5ac4628b82bf70204