Merge "Optimizing the code and uploading ftrace logs to artifacts"