Merge "Stop using __system_property_area__"