Merge "Update default config areaId's" into pi-dev
am: 6bf62943fc

Change-Id: Ib51b473edd766df0b6c10ad6d2b48b3f51eae1ec