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

* commit 'c8c9ebe868bb16f1b564b95243c0d5fd1d09ad6f':