Merge "Fix issues associated with hold failure" am: b15d892c2f
am: 07ff89e16d

Change-Id: I480dc9a1b802a0e44952ab18ce62238964279091