Merge "Update our hardcoded measurements"