[automerger skipped] Merge changes from topics "area_info_refactor", "dbgf_test" am: 4d5d4fb7ba am: 1126f758bc am: 5133065f12 -s ours
am skip reason: Change-Id I791a8a482705ff2fd53f77a56c02969f020f888d with SHA-1 b670fbd0fe is in history

Change-Id: Ib156403341b356a8e6ada61c54c00fc7ab880bdf