Merge "Fixes count bug and lint warnings" into nyc-mr1-dev