Merge "Upgrade to asm 5.0.4"