Merge "Refactored area update info support" into oc-dr1-dev
am: 698dc94151

Change-Id: I8df78f80b3bcadcb9c3a409cea5f75f64f76ed38