Handover API cleanup.
am: 7c031f2244

Change-Id: Ice65485609cbfd35f7ab1f12fe21f7efe1440fb0