Merge "Refactored area update info support" into oc-dr1-dev