Merge "CTS test for diskstats protobuf dump"