am: fd2188a0 * commit 'fd2188a0': Tidy up uses of Integer.valueOf. Change-Id: I63596104d4768b8815cd579708e30599c029e643