Bug 22818: (QA follow-up) Respond to feedback