Merge "Additional cleanup of start_device_log."