Fix compiling on GCC9 am: 7e03757b7d am: c3ea2f3793

Change-Id: Ia7ef526461c87ba1e1b43b9db82f959af87f39ae