Merge changes from topics "area_info_refactor", "dbgf_test" am: 4d5d4fb7ba

Change-Id: I1c9a0cfa3fe6cc98b7a2a9a84361334d3d300a44