Merge "Upgrade to asm 5.2"