Merge "Fix unit test failure"