Merge "Support updates to the data usage graph" into nyc-dev