Fix handling of Empty Tag string in Stats Infra

Change-Id: Iced3a500a850ac5a12c2e5f3c1385c86fa9b5736
Merge "Fix handling of Empty Tag string in Stats Infra"