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

Change-Id: I8517509a5726fed5560bf1f48c0a84cd9656e32d