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

* commit '77fc8f9f252634bff7f84e9251e0a2d3b02b136f':
  Tidy up uses of Integer.valueOf.

Change-Id: I90f81cc9708dfacd61373ca2dd600e567f567417