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

Change-Id: I1bee4e7438a1fd5d448851fc782fb2b87f439746