Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev