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

* commit '982b3c0fcce0c4d0eaaa12a6c28839239388e05b':
  Handle potential <clinit>() correctly in LVN.