Merge "Prevent accidental conversion from int to Status."