Merge "Snap for 7925884 from 5546d81826f12c7813db61244f8cfa34aa12d96b to sdk-release" into sdk-release