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

Change-Id: I8f94424096b1ef8d1b16d74d3fabc437ab94fa43