am 1c684ed1: Merge "Fix lazy-instance template to preserve object alignment on MIPS."

* commit '1c684ed1b5ac92ae473db5718627405367eb1766':
  Fix lazy-instance template to preserve object alignment on MIPS.