Merge "Cherry-pick: Specify const for operator()"