Merge "Fix the unit test failure."