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

Change-Id: Ibb4ae749d9eaa0cc10f2ebb721c2b94fa13cac38