Merge "Merge "Add unit test for BpfInterfaceMapUpdate" am: d512ec646c am: 6c6cf9fecb"