Snap for 8952093 from f0687c8a10b3e371dbe09214db6664e37c283cca to sdk-release

Change-Id: I043c27b9f819fad0018f40cbe9103747a2dc9bc8