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

Change-Id: Idf1db59af0476a2aa15f44e54f5fcc59d3cd8e5c