Merge "Snap for 5475808 from d5724aefe91189c173833d792f1ab1b5e17d8eec to sdk-release" into sdk-release