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

Patch 3.

Change-Id: Ifb539c1fe7d9c2f4ab901527890bf5df464d36f4