Merge "Avoid autoboxing."