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

Change-Id: Iad25d85eb0d115818b4f7e596420a38488e040e8