Merge "Fix a bug introduced in change 73712"