Snap for 9979206 from 5bf68823e604623e2366eb626bfcc10fda60729c to sdk-release

Change-Id: I428462efdb6c1f04930349a9ec2dc4aeba41d238