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

Change-Id: Ib736c4b26fac7262727873cdccd510927226f8f9