Merge "Merge "Refactored area update info support" am: b1092bfd55  -s ours am: befb4f2ed4  -s ours am: 84f59db864  -s ours am: 8a9139d09e  -s ours"