Merge "Refactored area update info support" am: b1092bfd55  -s ours
am: befb4f2ed4  -s ours

Change-Id: Ic978426f763d0c8be4381d0f836cec198153c031