Merge "area info update improvement" into mainline-prod