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

Change-Id: Ib543bfc394dc3294c61a958962214c433b69bb19