Merge "Add testIpv4AddressForSapAndLohsConcurrency test case"