Snap for 8952093 from 38d9be81be809febb78b79b841f66d051ce499aa to sdk-release

Change-Id: I72a45a76b41eeee54477d3e5a4a5e02915b4fa5a