Merge "Snap for 13198286 from 9bc2137b11bb8547ee2b9612eadf8f3edffe64ad to sdk-release" into sdk-release