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

* commit '5d07cb41230f84d4dd018c1f9f9732d6eed4351f':
  A few more optimizations on avoiding HClinit.