Merge "Snap for 5798008 from 87cf89ca6aff0d2282af0c9d8e17340307d27bdd to sdk-release" into sdk-release