Merge "Snap for 8952093 from 30828e80b753c16ba8a210873bdfbd13df57065a to sdk-release" into sdk-release