Snap for 8096610 from 2118fe8b9824bf1ccf5c530cc2c0e0634154bf64 to sdk-release

Change-Id: I7ccf085d9b4d167b233f1fa2092e2074bccfe47b