am: c45eb6f1 * commit 'c45eb6f1': Tidy up uses of Integer.valueOf. Change-Id: I7e8e7f9c8ba936da906460dc29ebabb8f50bcb9a