Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast" am: 4df6c75b99
am: d0be609210

Change-Id: I8dd81fe9b4bb71b856a023c99594568d0442837c