Merge "Fix LOG_PATH to use 7char uuid"