Merge "Snap for 5590969 from 23d64d603c92e6cbb59736991012bc686095770a to sdk-release" into sdk-release