Merge "Fix FastNative/CriticalNative annotation lookup." into oc-mr1-dev