Merge "Snap for 11566117 from 4e1de7fb0aac4f4437982ed2d54690f7a306f7ac to sdk-release" into sdk-release