Merge "Pass some arguments by const reference."
am: 877bbedc8d

Change-Id: I8b04803a030198b96bd930289413899ec4d2a25c