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