Merge "Refactored area update info support"
am: eb0fb7907b

Change-Id: Id21fefa68f0309537aea925456a106840422d25d