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

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