Fix sign-compare warning am: cb8e0a08ea am: a66d9d59dd
am: bbf889512c

Change-Id: I0749caa6b985233fc971426eb85acbfeb0ae4295