Merge "Fix needless value boxing/unboxing in Am.java (except the Long unboxing covered by a separate CL)."