Merge "Delete unused broadcast receiver" into nyc-mr1-dev
am: 1b4ad1c701

Change-Id: I6aa1f3f58de7d4a2377acbd6655cbeda3fc2433c