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

Patch 15.

Change-Id: Ia16b74da1bff92996a2f913f22701e1bc2dfd284