Snap for 7144110 from 4eb6e09a0e9505c26c8a92ad04d85691482e8174 to sc-v2-release

Change-Id: Idc03172d292f4c2775f429b5cf0fef76390dc1fb