Merge "Add a flag to enable/disable the diskstats logging service." into nyc-mr2-dev am: 56d29925ac
am: 4726ee4435

Change-Id: Ib8a6e37e37a73f61eee28a3a656c349af327c230