Merge "Remove special treatment of native method for CHA."