Tidy up uses of Integer.valueOf. am: a636a75
am: 415b7fb

* commit '415b7fb2a12b12d3fbcd5c085ea7a1aba6284fe6':

Change-Id: I31bc5f24271dcb88db15a471c2e335a9d2cba57e