Merge "Added todo items for a potential metrics issue" into nyc-mr1-dev