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

Change-Id: Ic51e3a500e87ca665d96332942dd5dfdd92ee03f