Merge "Handle potential <clinit>() correctly in LVN."