Merge "Add System Properties based settings for USAPs"