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

Change-Id: I661f0301dece204b47366eb5e9faf09767698bf7