Merge "add neko metrics" into nyc-mr1-dev