Merge "Enforce sysprop owner"