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

Change-Id: I6119eb289794ac658196fd7b25863c1404807fc3