Snap for 7166403 from d868265f9fa8c2f7267fca70e54fc13e466af34e to sc-v2-release

Change-Id: I35dc9d5b62dbf7a89413d1136c5bc41100246a66