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

* commit '4900f436704a8d30007bddc5834d0eb91a9a9678':
  Fixed a discarded const qualifier warning