Snap for 7571067 from 9a2f0968702ac1b389ecc486c1c2eb011ea757c1 to sc-release

Change-Id: I1b947242b10a99c05aa830978a52d80baf2b4105