Merge "Tidy up uses of Integer.valueOf." into nyc-dev
am: 6da7e3f

* commit '6da7e3f8c4691fbd1642b4657f714ae43c3e462c':
  Tidy up uses of Integer.valueOf.

Change-Id: I0fc3a69f2f8515de9e34996e07fda5a20a937354