Merge "Snap for 10399941 from ed23b160f5a26cfd589116d87cf5291b8c03bd94 to sdk-release" into sdk-release