Merge pull request #12518 from eileenmcnaughton/export_notice_tests