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

* commit '606b16bc160e66709408b3e49e273efcff0a148d':
  Fix a typo in image processing test