coverity#1257110 Big parameter passed by value

and

coverity#1186125 Big parameter passed by value

Change-Id: I6cb6863645647edf4fba114059195582679c30c4