Fix compiling on GCC9 am: 7e03757b7d am: c3ea2f3793 am: eea7629846

Change-Id: I35173c9e437aad0692746cf85d3569628016ab19