Snap for 7584485 from 26848924ea679dc1551d2e75edbc05f8928ca9ce to sc-release

Change-Id: I36495c60b8579cc7aed82d412b7d788ae41b02c9