Tidy up uses of Integer.valueOf. am: 7b55ede am: b39b00b
am: 0302ca2

* commit '0302ca214594fa9cfa31dacfcbd7ad845d1abc5c':

Change-Id: I6edb314bc179f4b6423af6f9efc238c7859b8101