Merge "Switch RmTypeDefs over to asm v5" am: 611120adfd
am: 602245b028

* commit '602245b028341e94822578f4a670f11ddd912a5a':
  Switch RmTypeDefs over to asm v5