Merge "Merge "Refactored area update info support" am: b1092bfd -s ours am: befb4f2e -s ours am: 84f59db8 -s ours am: 8a9139d0 -s ours"