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

Change-Id: I29e37250a76875927d1c2ce35bb13c6eed214137