am: 3c44afb8 * commit '3c44afb8': Tidy up uses of Integer.valueOf. Change-Id: I88e745da3faf05d8f5c07d98f7f3949d0fd73872