Merge "Snap for 13278158 from e2f098935447ca4945946de5cb69db843fe3f003 to sdk-release" into sdk-release