am 257b9521: am 4900f436: am f442cf27: am b3a5343e: Merge "Fixed a discarded const qualifier warning"

* commit '257b952155c3d26dd4de12bde642e8e5802269c9':
  Fixed a discarded const qualifier warning