Fix random underflow.
am: 448cff811f

Change-Id: I412fba50c4cf446899f1f2b3d87d076fdb587d9a