Committing Christine Li's (jycli@ca.ibm.com) patch for bugzilla #18210.

3 files changed