Merge "Update default config areaId's" into pi-dev