Merge "Fixes typo." into ics-mr1