am: 968e4fdd * commit '968e4fdd': Tidy up uses of Integer.valueOf. Change-Id: I19f6b5cbeba2f327be7382c6ab26ddb420b2af32