This reverts commit 00cbb411. Reason for revert: Test is failing on 32 bit. Bug: 112848347 Bug: 112827048 Change-Id: Ic778038c9c51d4d9e3aa721a0ac2d164facc40e4