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

* commit 'c863472b3cfb274409f08dc73907222078e0f18b':