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

Remove casts that are no longer needed after Patch 8.

Patch 9.

Change-Id: I011bb2d4dcd65f0e66a8fe8fa44ea86e794f20ce