am d9a59ca8: Merge "Fix build breakage."

* commit 'd9a59ca8f038a0f93a4e1504e0f7f8f388848719':
  Fix build breakage.