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

Change-Id: I0c3ca2ef55a67b1f2c00f19635dcfd8ed0bbedea