Snap for 8782634 from f2c29695860da4a12287226ffed930e74fc2fd6b to sdk-release

Change-Id: I0aedb5dd0887dd88798af68faa7af1d79b77dd46