Optimize annotations to use term based Multiterm construction

Change-Id: I57d1cd0b8314db6447538ddf9e01eb6aa0d4cb9f
19 files changed