Merge "Remove special treatment of native method for CHA." am: 60acc33c5b
am: 3c5176e15c

Change-Id: I0b8f1b2f79e9a8c7826e302ef6398a294d589e14