Snap for 7149879 from 5dfd2a12a7a6324c5a129983991f44fbc9baab14 to sc-v2-release

Change-Id: I229e46f094c537f22175d1cdfdd0f4044b4ce500