Merge "Remove ro.url.legal* props from proto"