Merge "Use List instead of array in network logging API." into oc-dev