Merge "Decrement size of pending write queue by correct amount" am: 79fc8d0212 am: b492ac69b5 am: 0cf13f7ded

Change-Id: I555d97575c9f4780bc4edcd46ba4cad0b2ff64ef