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

* commit '8a5b50bf679f7c7fec1a53f5c0b9ea6579bf6077':