Merge "Replace logic for sdk source jar" into main