Merge "Snap for 11662267 from 2aa7a5f3742a03a00bd6ae579e0b39626eb864ff to sdk-release" into sdk-release