Merge "Fix test for verification of clinit method"