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

Change-Id: I7ea81de27b81c02e5386c36a7efba1b63d77b0a0