Merge "Remove property_area_initialized" am: 93f82d0897
am: c70fe0073e

* commit 'c70fe0073e93a3175f3c07778ce81bf9b03f566b':
  Remove property_area_initialized