Snap for 7128142 from bd3635196822c9dab3873a9d12518937ba59d537 to sc-release

Change-Id: Ifc9e6b7026ec177c4139fc980641b892afdc123c