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

* commit '581a33344485181eb3484ba7bf50ff2b52be6d99':