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

Change-Id: I43bd88f795c81f612b2947c09efbf3672b476b71