[tate] dss changes

Change-Id: I8f8ef28409189b86accba823abe5b08d722dfedf
Merge remote-tracking branch 'kfire/cm-10.1' into cm-10.1-dev