am 50fb2436: Merge "Handle potential <clinit>() correctly in LVN."

* commit '50fb243619d337d20b56d2713d861166d48cb491':
  Handle potential <clinit>() correctly in LVN.