Merge "Make asm-3.1 an optional module, remove from grandfathered list"