fix compiler warning
(cherry picked from commit 904416f4631d842a105851b4a9931ae17822a107)
(cherry picked from commit 3a5f8de21fba3656670b8ee35e020f159d4110db)
(cherry picked from commit efcb1af30b63f91d3235914962bd4aa399bc08ba)
(cherry picked from commit d9a1c7b527d7252195fac15636c22101ceb775bf)