Merge "Snap for 11566117 from 9326acc6581866ad6b509eefc0cb9e9f1bb24043 to sdk-release" into sdk-release