Merge "Snap for 11754915 from 19f9d8c7b37e67fe3ac839cf9385caa178f6a47c to sdk-release" into sdk-release