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

* commit '577bfb762fb820df3d2fad9e31968b9646b01782':

Change-Id: Iaf843177a49e22ff4c5e99cc2a3465ef4dff37fe