Merge "Fix NPE checkjni" into nyc-dev