am e546b879: am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1

* commit 'e546b879a5aa9c58a58fc1c5a2e3eb0123d4d5b2':
  Fix a typo in image processing test