Fix sign-compare warning am: cb8e0a08ea
am: a66d9d59dd

Change-Id: I062ca6e1d4473de18560f8fb93602a429de203af