Add ability to override address validation for UPS

Previously address validation would be enabled always. This provides a
way to pass an option parameter to override that.

Change-Id: I4d63802619eb80d07e750b5212ce9dd5bb0bc8c9