Snap for 12199818 from adc4ca9116ad3839a4bd4a8bd48833106fac81ef to sdk-release

Change-Id: Id7d7fb3cdce9203f4c7390cd3f5f6969e7fd5c3a