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

* commit 'ef5f03da788d28130f8bc3f33db3bef69ac416ed':