Snap for 7625910 from 9000bdc25f1af356cec65c2d32d8d33b5d2a8b8b to sc-release

Change-Id: I00ad85b57cad05f18eb774bcbf80065eb023a0f7