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

Change-Id: Ideac6fbfb6638e43ef499ff75a804295457e7c50