Merge "Reduce the memory usage of the ProtoLogToFile" into tm-qpr-dev