Merge "Remove ro.url.legal* props from proto" am: c4fdd9ac1d
am: 3b47b26fe3

Change-Id: Iefa4f434b5c7898e18cfe1a991e53287b6e55c3a