Merge "Store up to 5 network log batches if needed." into oc-dev am: 52e5e75313
am: 4d52068836  -s ours

Change-Id: I82a1bffd2e06df2d91e32a06d9feea0f99e5457e