Snap for 7911557 from ea77e495246756b922c9793794bca3722a067641 to sc-v2-release

Change-Id: Id383c09186f44aaad173f851ad9fa1aec055546f