am f7b12e7a: Merge "Move annotations to native."

* commit 'f7b12e7ae8f481f3fab27d1a17bded4b4f2ce423':
  Move annotations to native.