Only variables should be passed by reference

Was caused by Change-Id: Ic46a6146a0ab8915bd4a3274f9ac1ae251bd7e2c

Bug: 58684
Change-Id: Ica7071381870bc76d21464be778ba0df50dc99a7