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

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