Revert "Many operations could have been const"
am: a47727e32c

Change-Id: I2bf897c65eed601dc89268ae9c6bb936d67749e7