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

Change-Id: Iaf97a1529aba543002cbb8ee70f4cb65d2f3a292