am a7110fd1: Merge "Fix build."

* commit 'a7110fd19aa1a2aaa1d84fdb038c02dec4ec9c50':
  Fix build.