Merge "Many operations could have been const"
am: 98bbd5fe31

Change-Id: Ia5eadbe56fc319a539e0c6d1f349a0f302f78b0b