Merge "Tidy up uses of Integer.valueOf." into nyc-dev
am: 14110a1

* commit '14110a108b7b09ca25157190fdfd17ef5b3bc79d':
  Tidy up uses of Integer.valueOf.

Change-Id: Ief4089929520485432d39c8d7c2a624bcd1eff5b