Snap for 8226173 from 5f43ffa6a168990aaf9eb58311848c179246236b to sc-v2-platform-release

Change-Id: I5b14bb28a67d1b0c92a2ee08ec33e44dcb29b01c