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

* commit 'f442cf27c5d1229eb32973cb499578ccd63ba727':
  Fixed a discarded const qualifier warning