Merge "Snap for 11785460 from b5bcb5ba1106e82e6008c36843657ed3f259eb2f to sdk-release" into sdk-release