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

* commit '77f6117778d440fe09dbec8e6f5f67bbb6c62adc':

Change-Id: Id24a299d10753e9eefdb3d0fc6951268e6c0af65