Merge "Merge "Update test_mapping with the new network policy tests" into main am: 49bba3e309 am: 4661478181" into main