Fix issues associated with hold failure am: 07a279afa8 am: f2078831de
am: fa4c3bfac5

Change-Id: I5541b1526ab21daa6e8126849e5eb2f7e86f1dae