Merge "Snap for 7183507 from 0d97043346dd91b8f1fed38f11411ced3893f303 to sdk-release" into sdk-release