Merge "Fix a typo in image processing test" into ics-mr1