Snap for 8121614 from cd66eb8d16e0542241b1b9403e1f9fd563f786dd to sdk-release

Change-Id: Iaacf1f350ae1cde31e66f69b3d4b419d78869dfe