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

Change-Id: Icae03afa86e7b660e9f52df252d2e3c961762be8