Merge "Snap for 11812660 from d38aa9fa0ae9c902bb47b6dabd0b8d1a48796934 to sdk-release" into sdk-release