Merge "sdm: Align system properties with customer documentation"