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

* commit '7575c6b4b3e898c86d54fb26fd9fefaef46b8e07':

Change-Id: I9218a80076b9b5359f8a9daf7d248acbd5efcd51