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

Change-Id: I109acf7f65bef5e8c0f417ead3e700f7f5e5d04a