Merge "Remove extra leftover logs and use uint32_t instead of unsigned int."