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

Patch 6.

Change-Id: Ia133cc6f2fa8b11b92f697fc76ccbbe9b5e07cef