Merge "Snap for 9979206 from 5bf68823e604623e2366eb626bfcc10fda60729c to sdk-release" into sdk-release