Merge "Fix intermittently failing unit test."