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

Change-Id: I79d28e3fa65beca840e553a01c9237392e914769