Merge "Fix system crash due to mismatching begin/finishBroadcast()" into nyc-mr1-dev am: d6f06df5ec
am: b48e174a5e

Change-Id: I58db82c81f464d8366bd09674dc4f38d4c391789