more sd changes

Change-Id: I4e8b237e2b925adc0921348cc9a1401dfa7cbeec