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

Change-Id: I01491cfe0011b7574ef4fd46362a727d865850e3