Prefer primitive types than wrappers
am: 33703216c3

Change-Id: I2f56367a14b9f17fe3e4008af9b78b5cb2b62760