am a62f16ac: Merge change 8877 into donut

Merge commit 'a62f16accad31e03ede5e4e6525dbe30dccc6db0'

* commit 'a62f16accad31e03ede5e4e6525dbe30dccc6db0':
  Remove warning in non-eng builds.