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

* commit '4a6e6991b0df0d1b269193b9e9edbd3bc44ba238':