Snap for 8952093 from 121e448c11b467dba5073c89bb95f5dd9eab7a8d to sdk-release

Change-Id: I3107b4dbef6365c4a9cd1eaab9a3bc006af3ec5e