Fix system crash due to mismatching begin/finishBroadcast() am: 7bdb9ce978 am: f3c4729947
am: 47fc09457d

Change-Id: Ied3686b611a73b78d50d5737ec65522bfef6f63f