[automerger skipped]Merge "Update handover failed constant name." into pi-dev am: c100da8c39
am: 5d91c692b8  -s ours

Change-Id: Id16fe11c774801ab461bd2b5bcecb1fbb3083950