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

* commit 'e522c5efcecb5aebb782c64776f7a15d50d4337d':
  Add some missing 'const's.