Merge "sdm: avoid set PP features in the first commit"