Remove annotations with constexpr params am: 3dfccafba4 am: 00cdb1d1d2 am: eaf57d5348
am: fdd4d50ce8

Change-Id: I860608dede93c2810fb90844646702407a0fd12e