Snap for 7599941 from d9639a9bf4a92be0c60018c127c7382989f40f74 to sc-release

Change-Id: If362bf707f7474f7659acafa1a7d94ee1f75f44a