Merge "Fix sal-common-api dependencies"