am d82c7daf: am 4608b9d9: Fix build breakage

* commit 'd82c7daffcc7d8e67e5de15d5aa304f35c2aeef2':
  Fix build breakage