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

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