Merge "Update setupwizard library to use correct support-v4 replacements" into oc-dev am: 4af0b562 am: 6f9823b5 Change-Id: I33f1b73492e62093fe1d6ecab87d90ff188b9634