Merge \\\\"Simplification for associative and commutative operations on constants\\\\" am: f7ba8758 am: 0978cb01 am: 4c07991e am: 09b67dcb Change-Id: I9df327a11773fc48138f6dda75485c3d942b144b