Merge "Snap for 7779910 from 9f2c62481f413f80c148cec3135d8bb4ff20645f to sdk-release" into sdk-release