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

Change-Id: Ia608d4af6afda14097a94013bf2dbe64962ebd74