Merge "Snap for 6533464 from b72bbb2dfed7d5a2f712fb65c3f55d75a2982387 to sdk-release" into sdk-release