Merge "Snap for 6198741 from 5dd29168be0b04bd597f87099d7a6835a07ac9ae to sdk-release" into sdk-release