Merge \"Fix accidental pass-by-value\"
am: 27d99ed243

Change-Id: Iab0f6c30f77a0764a11ce094d05a79e81d28685e