Merge "Fix a build break." into ics-mr1