Snap for 8253222 from fccd8613f2fd3ec704701e037a4c04c5609ef53b to sdk-release

Change-Id: I0c3a96cb6221625cf3a75bab74ab419277c70fa6