am 07bdc2b8: Merge "Fix build."

* commit '07bdc2b8e6980173ca9e8070803dcaad042e52c2':
  Fix build.