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

* commit 'e65a9ab1ea42d1f6190bee844ee666b7910d71ef':
  Fix build.