am 958aba14: Build fix.

* commit '958aba1421f2234aeafb22219d45a561e109a445':
  Build fix.