Snap for 7620055 from b4152f25bd3464344c83dbbd9ac1a90fa7acaaee to sc-release

Change-Id: I3d0b7ad67914778dc6c7e928a6e7c60b03b8eae9