Merge "Set up configfs" into nyc-dev