Merge "Refactored area update info support" into oc-dr1-dev
am: 5af2d63721

Change-Id: I1ab48412baffcbc6ad2b98ea0966cff20c9762aa