MFC r270992:
Fix logical error.
MFC r271017 and r271018:
Add new quirk.

PR:        193279