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

Change-Id: I9de02cf8de2ec76e859a8dcb44d60420d819d02b