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

Change-Id: I5fac847ec88a58586f755b77b25ee6eb8aecccbb