Merge "Snap for 5475808 from 14f0dbd296a79a67d4993bacaa01f3671340e8d0 to sdk-release" into sdk-release