Merge "Handover API cleanup."