Merge "Add a flag to enable/disable the diskstats logging service. am: 88e45dcd1f am: 2297fd2946"