Merge "Store up to 5 network log batches if needed." into oc-dev