Merge "Refactored area update info support" am: eb0fb7907b
am: a9aa7abf5a

Change-Id: I6e56186995c0698439be1f18cbf24dc565b43aa6