am: 63638bb4 * commit '63638bb4': Tidy up uses of Integer.valueOf. Change-Id: I19b2e411e9d4c22e0355250c4a41903d2c810214