Call-time pass-by-reference has been deprecated

Change-Id: Iae32827bf3c7fd6b22f1b373fae6d6e8b426e16f