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

Change-Id: I90ab8802deb2eea89aca2dcdbceea9f1317385d0