Snap for 7280565 from 92b70146b17f268a3db8caa1243ff4b169b94f33 to sc-d1-release

Change-Id: I74bcc404fccf9ad9df2369775248046c2d449df3