Minor change to be clean on integer sanitization am: da86b1836d
am: 8434032443

Change-Id: I97744feca4b501e3db37c84ed9c6252f17af678b