Snap for 7398294 from 8f2bf45bd0fe0b8600268f8da8e9cccabc0f02a1 to sc-release

Change-Id: I880880a61953afa76d4fca082429efbfc40c6d80