Tidy up uses of Integer.valueOf. am: 7b55ede
am: b39b00b

* commit 'b39b00b3dfdb634d96758f378498aca4caac499d':

Change-Id: I5fad795aa6c669a866c8e176ee2bbc9b087532c4