resolve compiler warnings Former-commit-id: c7fbdce5dc7fde8b8e188320408dc547b9ad5e51
Former-commit-id: 55b74524b06af6f5c443053a56216c0db465fb2f