Merge "Snap for 5590969 from b6be9425299582fb554c6a42f8e110bef794828f to sdk-release" into sdk-release