Fix issues associated with hold failure
am: 07a279afa8

Change-Id: I3ea7fde0573a1a79eb2e614f283bb163e5a17c0d