Merge "Fix the gauge metric data size estimation." into pi-dev