Add scala code to mainline
Merge "Add scala code to mainline"