Merge \"Simplification for associative and commutative operations on constants\"
am: f7ba875851

Change-Id: I3aac15baf7dd9b5f4903fd0e4799e37036cb5a25