am a9007fbd: am 69b4587b: DO NOT MERGE. may fix build on some version of gcc

* commit 'a9007fbdae6671f66535da4b9dad04b19aaf9186':
  DO NOT MERGE. may fix build on some version of gcc