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

Patch 12.

Change-Id: I98caa1b828bb90b85b8fd4fb64629aec06a99075