Merge "Refactored area update info support" am: b1092bfd55 -s ours am: befb4f2ed4 -s ours
am: 84f59db864 -s ours
Change-Id: I89bd02a64c96fd15838eeb60488042bc758a2219
This commit is contained in: