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