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