avoid unnecessary boxing

Change-Id: I1fd423ea521149e24ce159af48bc6d1da6f37646
2 files changed