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

Change-Id: Ic611b4f57f24bc6f7d968aa5f3ad8167348613b0