[automerger skipped] Merge "Fixed handover not working issue" am: 7d65a58b am: 98015a44
am: 2f040002 -s ours
am skip reason: change_id I730b2350e7db3517180431e4b23d7a3fd7a7dd6e with SHA1 7e6a8f90 is in history
Change-Id: I153fa3d28a8ea153bd2e7be1d3b7c7612895ac02