am c0121fe8: am a3dc45ac: Fix build.

Merge commit 'c0121fe881699012b056911c309556769dbae495'

* commit 'c0121fe881699012b056911c309556769dbae495':
  Fix build.