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

Change-Id: Iea4e7db91c688a2622a5c9f0a00936da39b2fd89