Bug 15494: (QA follow-up) Additional polishing