Merge "[Regional Preference] Remove unit tes tof systemproperty"