Merge "Fix unit test failure due to IllegalAccessError"