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

Change-Id: Ifdb4b625f21dcda5248071263aaf6936158efb39