Merge "Rename handover failure constant per API review comments." am: 7c8a877231 am: ffe1c22271
am: e4330eaaf0

Change-Id: Ic0555b20dc508d022c0165a5d9dc3b40b33db70e