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

Change-Id: If2c58bdcf2ee86b9bd452c04f686b2361458007a