initial check in for sdk 25 integration