Merge "Update FSI permission strings" into udc-dev