Merge "Update system API to match current code." into nyc-dev