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

Change-Id: I62d4aed2e2b0472e6ead9bf688a6ef08e767626f