Merge "Update to improved system_properties API."