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

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