Merge "Snap for 7800789 from 858aff25aa5dbaf5cdde29498fcdda3860831854 to sdk-release" into sdk-release