am 604019c8: Merge "Fix build." into ics-mr1

* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
  Fix build.