Snap for 9979206 from 57c37aa418d2b6dd08b30c56477aaeb83aa6e7cf to sdk-release

Change-Id: I948babada96f504e526e4773c5e1119968ac532c