Merge "Update handover failed constant name." into pi-dev
am: c100da8c39

Change-Id: I0309e0580f0b07099c63e8348c77c88ed95927fe