Merge "Avoid decompiling NOPs for 0 count case"