Merge "Update preconditions to be asserts..." into nyc-dev