Merge "Revert "Revert "Move annotations to native."""