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

Change-Id: Ib74ecfbb439c4c264b63aa029fd0416107bb4b0a