Bug 1032166 Follow up to bug 959201 with tests
Merge pull request #21184 from lanahuong/Bug_1032166

Bug 1032166 Follow up to bug 959201 with tests. r=steveck-chung