Merge "Refactored area update info support" am: 60d6ffbc6c
am: 3966912efa
am: d4ef8eca27
am: 71beadce17
Change-Id: I8fe1a2170c1e93e898959cbd932596b90ba10bb5
This commit is contained in: