Merge "Protect broadcast used in settings for bond cancel" into oc-dev
am: 68a4c91bb4

Change-Id: I3dc46eca98c859c540d528cb8a4a409587a25383