Merge "Refactored area update info support"
am: 60d6ffbc6c

Change-Id: I955c44c5d2c07dee0be7ae9990c0234eb989538f