Snap for 6653283 from 9c1e841be15076fefeafe74c66d31108ebc3aa35 to sc-d1-release

Change-Id: I4205c0bda39d9b298d56708cd25cff0b13001d60