Fix compiling on GCC9 am: 7e03757b7d

Change-Id: Ideac1e6ce8e3b58dad92336754a3915d391f8639