Merge "Snap for 8952093 from d300bba0e4b3b84fef4cef81b1818cbc194a5b8c to sdk-release" into sdk-release