Snap for 7519874 from 0868536de929ae73eba33943ed222de00437b1df to sc-release

Change-Id: I578d5dd23c1b60621ca3639d78882ee8f781c484