Snap for 7213262 from 5c15f84cf017853d524cbd72a419b1b67f8241aa to sc-d1-release

Change-Id: If8f32f95a300614ff5269a48f034c9ab0eb331f1