Merge "A few more optimizations on avoiding HClinit."
am: 95f7bbcd99

* commit '95f7bbcd991fbfaead438a2866354714eb32af38':
  A few more optimizations on avoiding HClinit.