Merge "Avoid decompiling NOPs for 0 count case" am: 5f2614f818
am: 143af39241

Change-Id: I6ce4aafbdbda91676d10a0b527a89eaa81258aaf