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