[automerger skipped] Merge "Fixed corner case when handover fails" am: c4962701
am: cf8034b8 -s ours
am skip reason: change_id I074d4b20ab76365f587fb752e63a3b7390ba8e0b with SHA1 86b608dd is in history
Change-Id: I0ecaf47ed3708b624633b305d7ecd9e7afb0418c