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

Change-Id: Ib616989cf16ef67118145d59845c7db764dc5ee9