Merge "Snap for 11566117 from 79de4a3427e6fab1b550ef581b4207fca8edfefc to sdk-release" into sdk-release