Snap for 7546601 from b240e2a86eb541c852579df39aec331a23f4ca5a to sc-release

Change-Id: I4e0c15d7c3710579b74179b54b97575fd2bc9ef6