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