Merge "Rename handover failure constant per API review comments."