Merge "Remove support for event-based handovers."
am: b2c1daf861

Change-Id: I03aea3dffd4a7d1af24d281826f87945441d6d14