Merge "Fix bug introduced in Change I856118d8."