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

Change-Id: I9ef945ffa869cc97cf96900ba5d881e5e2868cf6