Merge "Stop using __system_property_area__" am: 90c12683ee
am: 0ce0b54a0e

Change-Id: I01b9d03383c733bca41d508a5304c6f38d5d892f