Merge "Remove "ro." prefix from sdk extension props"