am 5786f5cf: Merge "Fix build." into ics-mr1

* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.