This was causing a compiler warning from -Wcast-qual. Change-Id: Ie525ffe20be4f38ced68fb0c4141e36400eb0717