Tidy up uses of Integer.valueOf. am: a636a75
am: b6e750e

* commit 'b6e750ef4d9f8c205a92f1358bb7e9801ab3456f':
  Tidy up uses of Integer.valueOf.

Change-Id: I04b0943ae3b0a7b909282785274d867b7bdb92a5