Snap for 12199818 from 673df54f0198077fdc2f564095fb8a706d710b03 to sdk-release

Change-Id: I6a88d5f00f32c4917056df2e76f6e03bba52124e