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

* commit '734c3de730122d5f75ef4fd0a32a5e56076a3cf7':
  Tidy up uses of Integer.valueOf.

Change-Id: Ic23ace1c5b6aa5acaef654916264a60abe4383d2