Merge "Purge StoreWriteQueue items to avoid system health issues" into oc-dev am: 009d0460f0
am: 9309b3d219

Change-Id: Iec4c38618b9aeaf274d8c4f0b9141aa20db4b0fb