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

Change-Id: I7ce4f3416ed4c2cb0ed1aba9ae7d2b2b539def2d