Merge "Merge "Add unit test for fromPublicNetworkStats" into main am: 8542185715 am: 066963741d" into main