Merge "Fix issues associated with hold failure" am: df6e5604f3 am: 9fefce6df5
am: c3557eb639

Change-Id: I82de9a1462a18707a6a9410e78f72b6908d6ee7a