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

* commit 'dbfe31b53c9560d07f4a5960f4eae673dce000eb':