am 9510f81a: am e522c5ef: am a3d1fb80: Merge "Add some missing \'const\'s."

* commit '9510f81a0360f55281aa3a3a8f53ca8b33eda3e6':
  Add some missing 'const's.