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