Snap for 7620055 from 4e257a92ca75f708840e2877735830b545f42511 to sc-release

Change-Id: I5d9eee11ef11f644d845673fa8e5e7dd99b5bc6d