Optimize annotations to not use hash multiterms

Change-Id: I7d1e99e5a5e55447b53eb8ba1eafb20cbbbe829a
13 files changed