Snap for 7620055 from a695659402c56531687b6a7ce6ed470f93ce3752 to sc-d1-release

Change-Id: I36a925408beeef94bdb79fa960c5c072f718c320