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

Change-Id: I594c306bf5b35b06c0fd8e080ee10fc73290b550