Fix warnings in bitrotted module

Test: builds
Change-Id: Ib94f78f7baffbc63cff708ca5d81233618f30015
(cherry picked from commit e8f16b3eb93245401cf0694e50bdd904732e4b84)
1 file changed