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

Change-Id: Iede1ea0f5f9409538295b3861e2343647ba51026