am c9774838: Merge "Revert "Move annotations to native.""

* commit 'c97748381468485535b11bfc8664c26385f4b715':
  Revert "Move annotations to native."