Merge "Fix the gauge metric data size estimation." into pi-dev
am: 3b592910c5

Change-Id: Ie8977d334e3345dd273f7f7fb587e5cd0edd77d8