Merge "Merge "Tidy up uses of Integer.valueOf." into nyc-dev am: 6da7e3f am: cda0406" into nyc-mr1-dev-plus-aosp
am: 4488fec

* commit '4488feca1d74089ff6b45e55b71c44528675eb34':

Change-Id: I7625698d1fe74364bdfa79da5d9149cb9ca53485