
        Address review comments and fix Gecko test failures.

fadae64