Merge "Snap for 6686656 from 9a494349a1068af58c81a6613777153a7ac596d1 to sdk-release" into sdk-release