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