Merge "Snap for 9679998 from 04d5903f121d7f9ffdff76ee9c00c61684cdd413 to sdk-release" into sdk-release