Merge "Remove dependency on sal-common-util"