am d507af32: am ae452bd4: am 47687a46: Merge "Build fix."

* commit 'd507af324d4ced1b107fc7eac3c6d880e5cf27e4':
  Build fix.