Remove extra intval() calls

Change-Id: I4f41e866fa93b54f27e841b95951dd6bd7d06a05
Merge "Remove extra intval() calls"