Avoid casting away constness using C-style cast.
Either use const consistently or explicitly remove
const with const_cast.

Patch 1.

Change-Id: If0345987a9bb349d19622eb501db79bbda10a575