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

Patch 2.

Change-Id: I9b69803f5ea4d79e6677da444fe9046ccfd5a4d1