Merge "Snap for 11238696 from 436e52284b6f948058609e345b0500e7fa2fa024 to sdk-release" into sdk-release