Snap for 8952093 from 57d2b8ec360b2af98c53ff8038b0af120ab77f29 to sdk-release

Change-Id: I5e4c957419a11a5c8dabbf8b4010e45854af4399