Merge "Snap for 8952093 from 79ece28f29bf9b49a6527daf3e50f80d31065243 to sdk-release" into sdk-release