Merge "Delete unused broadcast receiver" into nyc-mr1-dev