Merge "Snap for 7529902 from fb2bda2d86e3f391c8e822447821e618880f46be to sdk-release" into sdk-release