Snap for 10399941 from 9effceaaba37418a57ee73d30f5086f55d7a40c2 to sdk-release

Change-Id: I8e40bd48c499c358371b5e37597e4114627672af