Merge "Remove fake data" into nyc-mr2-dev