Merge "Add a flag to enable/disable the diskstats logging service." into nyc-mr2-dev