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

Change-Id: I7d23cfe0d175af9a17ed685d387a248045105784